Conversation
…rt (#2) This commit does the following: * updates deps * updates solidity version from ^0.5.0 to ^0.8.20 * implements ERC721 functions for EtomicSwap contract * adds ERC721 tests * implements ERC1155 functions for EtomicSwap contract * adds ERC1155 tests
Collaborator
|
I would like to note that in PR #5 there will be changes in deps |
#4 * add hardhat config, update deps and some tests, remove unnecessary files * remove `connect(accounts)`, use `should.be` instead of `expect().to.be` * remove `request`, `equest-promise-native`, `sol-merger` deps * update setup dev commands * use `connect` method instead of `from:address` as we use ethers V6 * update tests * Beautify js code * update readme and travis * update readme (fix docker command), remove env * call connect() when transfer NFTs * use `rejectedWith` with a more specific error * reduce duplication by contractRunner vars creation * remove rpc.Dockerfile, update workspace.Dockerfile and hardhat.config * use `to.be.rejectedWith` to match error message * error messages in EtomicSwap.sol, format code * update constants in tests * split require statements
This Implements EtomicSwapV2 contract containing functions needed to support Trading Protocol Upgrade V2.
laruh
reviewed
May 9, 2024
Collaborator
There was a problem hiding this comment.
If its 1.0.1 release, lets change version in dependency package to "version": "1.0.1"
Collaborator
Author
There was a problem hiding this comment.
let's use 1.1.0 to follow semantic versioning in a correct way.
shamardy
changed the title
This commit introduces the `SwapFeeManager` contract to handle the distribution of collected fees. This contract provides a transparent and automated mechanism for splitting fees between a DEX wallet and a burn wallet. The `SwapFeeManager` includes the following functionalities: - It is initialized with a `dexFeeWallet` and a `burnFeeWallet`. - `splitAndWithdraw()`: Splits the contract's Ether balance, distributing 75% to the `dexFeeWallet` and 25% to the `burnFeeWallet`. - `splitAndWithdrawToken()`: Performs the same 75/25 split for any specified ERC20 token. - The fee distribution functions are publicly accessible to allow for decentralized execution. A new test suite, `test/SwapFeeManagerTest.js`, is added to ensure the correctness of the fee-splitting logic for both Ether and ERC20 tokens. Additionally, the Solidity compiler version is updated from `^0.8.20` to `^0.8.30` across all contracts and in the `hardhat.config.js` file to align with the latest standards.
Alrighttt
reviewed
Jan 5, 2026
Collaborator
Alrighttt
left a comment
Alrighttt
left a comment
There was a problem hiding this comment.
Dummy review to remove this from my https://github.com/pulls/review-requested
- Add OpenZeppelin SafeERC20 to EtomicSwap V1 for USDT compatibility - Remove NFT functionality (ERC721/ERC1155), keep ETH/ERC20 only in v1 contract - Fix erc20Payment() payable modifier bug, add tokenAddress zero-check - Add Hardhat Ignition + CREATE2 deployment infra via CreateX factory - Deploy and verify contract on Ethereum mainnet and Sepolia at 0x61EEC68Cf64d1b31e41EA713356De2563fB6D3F1 - Update OpenZeppelin to 5.4.0, Hardhat to 2.26.0, Solidity to 0.8.33
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
solc updated from
0.5.0to0.8.20Deps changes
Removed Deps
^6.2.5https://github.com/OpenZeppelin/openzeppelin-solidity.git#release-v2.1.0-solc-0.5^2.83.0^1.0.5^0.1.0^1.0.0-beta.27Updated Dependencies
^4.1.2to^4.3.10New Dependencies
^5.0.0(Note: This represents an evolution fromopenzeppelin-solidity, transitioning from a direct GitHub link to a versioned npm package.)^2.19.4(indevDependencies)^3.0.5(indevDependencies)^6.10.0(indevDependencies)Dependencies Unchanged
^7.1.1^2.0.1